Just some refactoring