bit of a cleanup - no real changes