Refactored comments