improve tile ordering
cleanup