clean up
clean up
fix small bug in dependant params