Refactored and removed hard coded mail sender details