Refactor load code some more.