Minor reformatting / reorganizing