Couple of cleanups to reduce my code climate complexity.