some general cleaning up - ready for the next step Ann