Refactoring an Commenting