Replaced coordinates with body instead of world, cleaned-up code