Tidying up filename and comments