cleaning up from golint