Removed old code, and cleaned up some spacing