Ensuring email fields always lowecase values
Code cleanup