More reformatted code.