merge whitespace fix
more whitespace fixes and revert Py3 change