Tidying up, comments etc.