More semantically pleasing codes and much enhanced comments in the
affected files