Fix spec; cleanup