NIFI-65:
- Code clean up.