I don't mind this, but it would be better to wait with the stylistic changes to keep pull request to the point.