Converted to 2-space indenting on more files