Cleaned up the class interface.

Using properties instead of instance variables.

Changed delegate method name.