cleaning and a comment for the future