criterion cleaned up