Minor refactoring/cleanup indentation