Tidying up and comments