drying up the code a teeny weeny bit