Changed variable comma convention