Quick email refactor