Added Sample Data
Code Cleanup
Code Cleanup