Slight reformatting; renaming; etc.