Changed formatting a bit and removed old commented code