Format tweaks thanks to lacheck