Code Cleanup

Removed debugging messages.  Cleaned up code.