cleanup
more accessors KVO compliance