housecleaning commented code...