Some addition refactors.