A bit of tiding up.

Removing an unnecessary else statement, and some linting fixes.