Optimize imports; reformat code style; improve javadoc; remove the commented code.