It seem that there are some indentation issues... Maybe it would be a good idea to pass a linter on the code (as final step before merging, to avoid introduce inter-commit diff noise while the PR is on discussion).