Refactor flag/reveal method