clean & add comment