Code review comments added