refactor simulator class to have class methods