Added comments and descriptions