proposal: fix whitespace and wrapping