Cleaned up the 2, 3, 4, 6 scoring