Implemented code review comments