More polishing, gonna generate javadoc in next commit