Some refactoring stuff