Implemented final suggestions by class instructor