cleaning code some more