tidyup as recommended by @joelittlejohn