Issue #10, fixing code quality issues