added parameter cleaner + test cases