cleanup

aka sanitizing