PEP8 cleaning
Basic aggregation in place