Implemented code review feedback