Cleaning formatting up a bit