Refactored methods out into their own module.