Replaced the universe with a proper class.
Also removed some of its almost unused methods cluttering the code.