Added Snippet and Clean up