Why the underscore? I realize this is just a refactor though; not important