Formatting tweaks
File name change