Ran FindBugs, and fixed things.
Formatted Code