Clean up project
Update Grid.java
Update Game.java