Implemented some review feedback.