Refactoring simulations