More comments, some method renames