Clean up and a few comments