Applied code space vs tab clean up from yagamy4680 fork.