Unclean up a bit more