Small cleanup and additional comments.