Code review. Coding styles adjustments.
code review
Merge pull request #1 from eugenci/master

Code review