Disable image stuff, cleanup indentation