Universe tick refactoring