converting tabs to spaces
moving some stuff