Added comments, cosmetic changes