Refactor cataclysm mixin