start code refactoring
update simulations