c36e67d7b6
- Remove redundant intermediate variables - Explicitly use an early return on error instead of combining with other checks. - Fix unhandled errors and combine defers - Remove outstanding TODO that unlikely will be addressed Signed-off-by: Sebastiaan van Stijn <github@gone.nl>