Fixed all comments in PR