cleaned up the code some more