Make Core follow coding guidelines.

Also this.