Refactor over9000