refactored code, removed old example data that was no longer used.