godmode refactor