Fixed code indenting.  Removed commented out code.  Cleaned up code.