code clean up 3
Merge branch 'master' of ssh://github.com/afzal-lakdawala/dashing