Revert white-space errors of the previous commit, small fixes.