Cleaned up code, and shrunk grid size