Refactoring: minor changes to indentation