Improve initialization
Fix typo