More code style fixes

For #389

Also in one place I removed the saved Pattern for email and used Patters.EMAIL_ADDRESS since the project is on android 2.2+ and it's working fine. :) 

Last changes will come in an hour or two.