Cleaned up universe creation