Indentation and code review comments added