Implemented the suggested edits

Implemented the suggested edits