Refactored MenuState, PlayState

-code optimisations, commenting, and readablity