spec and indentation cleanups