Code clean up
Merge pull request #39 from codenvy/IDEUI-313

Code clean up