Implemented suggested changes.