Drying up the code a bit