More golint refactoring
More golint refactoring

mokhan/mop,dafyddcrosby/mop,mop-tracker/mop,nkhuyu/mop,mokhan/mop,dafyddcrosby/mop,Adai0808/mop,ykelvis/mop,Adai0808/mop,nkhuyu/mop,ykelvis/mop,mop-tracker/mop