Updated main files to the new style guide