more unifying of syntax/formatting of the source files