Good practices
Logical fix
Typos