Improved white space in production mode, fixes #642