Refactored comment blocks