minor renaming + formating