Converted the rest of the coding style to match Dscanner.