Some spec related cleanup