Cleaned up and added sample data