Tried to clean up err handling a bit

- Removed redundant int err declarations.

- Preferred combining "if (err)" conditions such that err gets tested
  before any gotos/breaks/etc. The compiler is smart enough to figure
  this out on its own, but it makes the code more readable in some
  places.