pomade

(verb) groom (generic term)

neaten (generic term)