Fix up formatting, readability