Fixed spacing, removed old code