Kit cleanup and refactor.