Fix indentation
Address code review issues