Cleaned up code - commented out debug statements