Removed obsolete variable.
Minor code improvements.