Cleaned up some comments in the newly-added code.