cleaning code a lot