Reduce complexity a bit more