Some refactoring king-safe