fixed and cleaned up spec
code review note [ci skip]