converting tabs to spaces + small changes.