Working on reducing complexity.

This is just meant to make codeclimate happier...