Added comments and refinements