refactor remarks