Formatting

It's about done!! :  )