Incorporate code review comments - minor identation changes