Using standard variable names.
Improved const correctness.
Added contains method.