code clean-up:  imports, javadocs, code style