#13 cleanup of spec code