Ashkan: half of the code review issues is resolved.