Fix typo & good practices