OTHERS: Fixing some typos and format