Code review
Merge pull request #1 from aakb/6.x-review

Code review