Make more explicit variable name.
Added commandline interface to class.