simplify comments
resolve #40