fixed a couple of golint errors. It still complains about the struct and I feel I should not need it