More comments, refactor for less code duplication.