More source reformatting