Minor update and style refactoring.