Removed useless error checks.
Small layout change to yield a better gofmt.