Revert "Added nickname and punct, removed parens"

This reverts commit 061de1a57a95cd2911c06bb58c29a8e488b7387e.