commenting and exercise cleanup