Lint some more.  Mainly fixing if( for( and } else { issues