clean a little and comment