Refactor more details.