Refactoring and Comments