Character tidy up