Drying out the code some more