Import cleanup, more javadoc