Refactor a little bit
Merge branch 'master' of github.com:TEAM-NAME-PHP/simulation-thingy