Aggregation list placement and code cleanup/JSHint