implemented code review remarks
2 files changed