Add subject to email and refactoring step