some formatting and renaming