Refactor the project. Find your code with `<Remark>` comment and refactor it. Also read all the `<Remark>` comments