More cosmetic changes and fixed a typo in documentation.