cleaned up comments in preparation for rebase