Addressing Chris's style suggestions.