CLEANUP: Code Cleanup for Tile Map