remove fiddly bit
all the fiddly bits in one place