simulator: several readability and maintainability improvements

Simplified several complex and unnecssary pieces of code including
removing visual clutter, better naming etc.

Author: anandbonde