Implemented code review feedback.