Code quality
Fixing #10