Refactoring and Simulation Questions