Technical debt reduction

A.K.A
"If Sonar made my paycheck I would be : "
![Debug All The Things](http://i.imgur.com/vxoaU1J.png)