Added simple constructor.
Cleanup.
Correct comparison.