CS fixes and a bit of refactoring to improve readability
CS fixes and a bit of refactoring to improve readability

5outh/mockery,5outh/mockery,fhinkel/mockery,TiagoMaiaL/mockery,Big-Shark/mockery,florianeckerstorfer/mockery,florianeckerstorfer/mockery,jenswiese/mockery,Big-Shark/mockery,kminh/mockery,jenswiese/mockery,TiagoMaiaL/mockery,yeka/mockery,tfrommen/mockery,kminh/mockery,yeka/mockery,padraic/mockery,fhinkel/mockery,tfrommen/mockery