Refactor for consistency/asimov 0.19.x