Format tweaks and nit-picking