Just random refactoring stuff