clean up, and add domain into spec