Refactor more.