Cleanup: Replace nested matches with method chaining

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>

Split off more modules