Formatting and name tweaks.