Fix indentation issues

changing from a mix of tabs and spaces to all spaces
changing from 4-space wide indents to 2-spaces.