Clenaup/comments/ideas