some house keeping and cleaning up the spec