spec syntax cleanup