refactor

Execute safe refactors.