Converted tabs to spaces for consistent whitespace

Also adjusted some indentation accordingly