cleaned up formatting, commented out many debug print statements

Just Clean up