more simplification and review comments