simple refactoring / styling