Refactor ProjectController to respect the comments in the merge request