cleanup the setup of World
cleanup the setup of World
Refactoring feature and steps