Simplify description parsing
Add description to json output