Some spec clean