add using statement join
clean up groupBy
cleanup inconsistencies
consolidate into properties
TONS of cleanup