Alex made a few changes on formatting