Fix accidentally damaged char class, tidy up