Minor Refactoring of Tile Selection code.