Unclean up a bit