Refactored Comment