Clean up.
Added string comparison.
Clean up, remove default debug lines.