Refactor intro