Formated code to remove tabs
Removed tabs, removed a few other findbug issues