Fixes final code indentation issues
Merge branch 'hotfix/v2.0.2'