Add some comments for clarity
Cleanup