Clean up, refactor logic back into Tile object