Cleaned up code and changed some parameters to make gameplay a bit faster