fix white spaces to comply with upstream