clean up and organize specs