Coding standard and refactoring
Merge pull request #4 from fprochazka/fix/cs

Coding standard and refactoring