Small improvements in syntax and docstrings.