Completed spec cleanup round 1