Maven goals separated.
Cyclomatic complexity reduced and error handling for set command
improved.
Needless match expression removed.
All null literals replaced with None.orNull.