Some indent cleanup and minor fixes