Removed some old stuff and made some better comments