Made code golint compliant