Refactored comments code.