Issue #193 Followed conventions