Refactor out some world helpers