Formatting fixes: we always use spaces instead of tabs