edited spacing and removed old code