Re-factored comment fragments