Clean specs and remove little duplication