Cleanup my commit mess (sorry)

- Removed commented out code
- Found the already implemented functionality to pull in information
for the description field, changed it a little bit and make the key
string customizable via another system setting (added lexicon entries
too)