Formatting, updated version