Cleanup and a few comments