Trying to cleanup
Fix bug, simulation can now row, a little bit cleaner