PSR2 compliance checks and deleted obsolete Email.php