minor refactor of spec files