Some initial reformatting