Cleaned up some code, also testing out multi-world support