minor formatting / renaming