Commenting, refactoring.