Formatting, small improvements