more cleaning code