Code clean-up and refactoring
Merge pull request #337 from codenvy/cleanup

Code clean-up and refactoring