Minor refactoring / reformatting