Add a few comments + cosmetics