Refactor clean white space

Just changed tabs to space (this was forked from a branch with changes which I reverted for this update)