Continue to refactor and clean up code for Primo.