Tweaks to be more readable
Fix for cases where description is used as title