Refactoring of the Simple Simulator