Reduce complexity.
Cheat travis false positive. Reduce code complexity.
Bug fix.