Some rather superflous refactoring