Swap tabs for spaces
More naming