Issue #32 Fixed some violations.