Simplify world stepping code