Refactor comments for Scribe