Formatting, tweaks, resolves #115.