clean up spec and move defaults to correct task