Refactoring the Intro