minor tweaks and remove hard-wrapping