Minor tweaks to added spaces and removing line breaks