Style fixes

sponsored by [golint](https://github.com/golang/lint)
THis is not right because we are returning an error on the io.Copy and not closing the file