Commenting, javadoc, refactorize.