Minor tweaks to logging and spacing