Formatting and renaming
Signed-off-by:thehutch