Implemented suggested corrections