Core "revived" and changes regarding code style