Cleanup and add final comments.