restructured specs
order refactored out
better prune syntax