Minor code refactoring.
Documentation update.