some spec cleanups