Addressed another cyclomatic complexity linting error. That makes all the src files lint-free