Some simple refactoring