Removed old stuff and formatting changes