Cleanup file, add some comments