Code climate refactors

Some refactors to improve static analysis on Code Climate ! Let's go to 4 ! Yay !!

:+1: