Revert "deleting one space before `:`"

This reverts commit b82a9b1c8faeb7a98aeeba678fadcd279c0862b9.
Revert "fixing wrapping - my NetBeans has a mind of its own."

This reverts commit 80be824fc76c7b7a95c675b5cd0ea5eeb7f522a3.
Reverted changes unrelated to issue #2325