just tidying a bit up...