Style and refactor.