Refactored cmments