Made comments DRY