Refactor unnecessary spec file and comments
Fix alignment
Fix email message being sent to the correct message