Simplify code and comments.