Long line indentation cleanups