Adding comments and cosmetic improvements