[minor] Clean up the code style and error grammar from #3