Added comments and editing