find bug code warnings, cleanup, a little bit javadoc