Revert "Revert "Added nickname and punct, removed parens""

This reverts commit ab4e279a6866d432cd1f58a07879e219360b4911.