Bug fix
#34 Lint errors fixes