Refactor toward better readability.