Commenting & refactoring.