Fix some lint warnings (#376)

* Fix lint warnings

Fix warnings related to variable names, unnecessary nil var initialisation, unnecessary
else blocks after return statements and unary variable {inc|dec}rements.

* gofmt -s fixes