CP2K: reworked after comments in PR