PR #467 - Reformat code from tabs to spaces

PR #515 - Reformat code from spaces to tabs