Fix issues found by Go Report Card
#81

an63 wants to merge fl into master

We do not currently have an analysis of these two commits