Refactoring and Commenting