Make Core follow coding guidelines.
Merge pull request #1471 from KoffeinFlummi/core-guidelines

Make Core follow coding guidelines.