Refactoring for production deploy, part 1.