Add comment, fix typo, reduce memory usage, etc.