Minor comments cleaning