Refactored tiles into Tile objects