Refactored to improve code climate scores

## Now 4.0 GPA.. :+1: 

I'm also opening this to see how CI likes it.