final touches

Formatting, mostly