- code cleanup
- rewrote url data fetching