Removed debug print statements, cleaned up a bit.