Complete descriptions and clean up code
Merge pull request #420 from gergo85/patch-29

Complete descriptions and cleanup code