Clean up selectAndReveal method