fix style for visible space and new line

this rebase the fix on top of the upgrade commit