Prefer spaces to tabs for indentation

Also shorten some long lines