Made specs more coherent, cleaned up smells