Separated classes and added game over process