Code cleaning
Rethink aggregates