Refactored Comments