Various up-to-date bringing, starting on indenting.