Minor adjustments.
Add some helper methods.
Renames.