Fixed up golint complaints.