Mr. Dewey's 1st refactor