Remove auto except for iterators and map lookup results
Fix indentation