Random refactorings
stuffs