Removed debug information and minor changes.