Cleaning up character class