major spec clean up