Code style (minor improvements)
Merge pull request #155 from radkodinev/code-style

Code style (minor improvements)