Clean up specs a bit