Minor stylistic changes & comment cleanup.
Add a fitting function
Small stylistic changes.