Refactor Reveal Mechanic