Clean imports and format javadoc