Fixed as all comments in this PR