cleanup + def custom vals