cleaning code more