Minor refactoring/formatting