Addressing issue #3 - fixing golint issues