minor, some formatting and renaming