Refactored code to live in header files.