The whitespace cleanup is necessary for having a clean code. Thanks for taking care of that. However, it makes hard to review the changes. A dedicated commit for this step would have been useful to better focus.