Formatting improvements. I think?