Refactor World and Tile to be the proper style