Cleanup.
Cleanup.
Refactoring.
Fixed refactoring issues.
Fixed wrong default.
Updated documentation to reflect API changes.