Code cleaning
Merge pull request #6 from zhulik/GS-code-clean

Code cleaning