added some non-word chars to cleanup