Cleanup code.

Remove debug comments.

Clean up variable names.