Style, commentary, refactoring.