Code review & comments added