Fix findbugs error
commit missed files
Re-format
Merge branch 'fbfix'