Refactored comment layout