Minor spec restructuring