Review

a lot of code changed
comment irrelevant any more?