Make code follow comment

And remove redundant comments.