Added formatter and resolved some FindBugs stuff

Also, formatted