Formatting, minor changes