Implemented several review feedback points.