PR Fixup: cleanup comment in refactor
PR Fixup: change the way errors are constructed

Avoid duplicate messages