code-review changes. code is clearer now.