fix tab spacing conflicts
Merge branch 'niamu-code_cleanup'