Random refactoring/aesthetics.