Apply changes according to comments in PR