Indentation cleanups