Proper style refactoring