Move teleport method out of Arena class, more cleanup