Commenting, refactoring