Clean up, findbugs, license