- Added Demo Data
- Code Cleanup