Just some minor refactoring