Removed some lines of code I left in that were commented out