Removed tabs, using buffers instead.
Extra tweak added.