Style fixes

sponsored by [golint](https://github.com/golang/lint)
@tiborvass You are right :) This should be changed to `defer`.