WIP: Reduce complexity