tidying up a bit, no real work done yet