Fix typo & standards