breakpoint var and clean code some