A few refactor changes.