Specs refactored and cleaned up