Further cleanup of the tile class