cleanup and comments: