Develop branch without tabs

Remove tab indentation and replace all tabs with 2 spaces