Stylistic changes.
Add functions needed by constructor.