clean up punctuation parsing stuff and tests

Signed-off-by: Koleman Nix <kolemannix@gmail.com>