Formatting and a bug fix