Improve code style

Per Clippy linter:

• discard explicit return for simple cases
• use if let instead of match when there is only one interesting case