Reduce complexity, improve coverage