Cleanups
Refactor GameElement, Universe