Reviewed MAIL module code, made improvements (readability)