Rearranging code to put related code next to each other, some renaming
Rearranging code to put related code next to each other, some renaming

pfjel7/housing-insights,pfjel7/housing-insights,codefordc/housing-insights