Cleaned up the terrain class