more simplification and comments