Clean up ... And a few comments