Refactor oopsie