Refactoring since we're not longer counting for primatives