add additional cleaning
added test for value cleaner