finishing up cleaning code