Updated rest of files to conform with config.
Please enter the commit message for your changes. Lines starting