clean up code some more