more comments, style, consts.