cleanup: changed match to if let in CreateDir and RemoveDir
Changed `return match { Ok(_) => no_error_code, err => err }`
to `if let Err(err) { return Err(err) }; no_error_code`
This may be less idiomatic (not sure) but is much nicer to read and
understand (at least to me)