Removed some commented code, fixed formating etc.  I AM THE SMARTEST MAN ALIVE