Some imports clean-up and javadoc additions