Doing a few refactors.