Move punctuation outside of citation

Still addressing #46