Use bang finders for discussions and clean up the markup a bit