Format and update to latest KCore