code clean up
Merge pull request #202 from codenvy/code_clean_up

code clean up