Cleanup and some comments