polish and comments