Made Core follow coding guidelines

...

again.