Formating fix
Fix typo
Stability improvement