Refactor to revealing module