WIP: Reduce complexity [Bovem]