tidy up much random crap