some more tidying before addition of enemy3