Issue #20 - do not shadow class fields
Issue #20 - Reduce cyclomatic complexity