Corrected some syntax, and removed extra un needed code.