- Slight tweaks, formatting, commenting changes and renames.