dealt with cyclomatic complexity (aka not enough helpers