Code cleanup and world goals
Merge with master