More indentation cleanups