Cleanup + Added Examples