Tidier reduction

Easier debugging.