Minor refactoring and code style
Merge pull request #6 from radkodinev/refactoring-and-code-style

Minor refactoring and code style