formatting & tiny tweaks