RF reduce complexity
Merge pull request #3 from dblommesteijn/code-quality

RF reduce complexity