Cosmetic clean-up, mainly in the spec directory