Enable findbugs errors and clean up