Code clean up

resolve https://github.com/vsClojure/vsClojure/issues/118
Merge pull request #129 from frankhale/master

Code clean up