Cleaned up some code in Universe.