Readability update

Removed two getters from Machine.java
Changed moveToNextMachine to be void