refactor comments flash