Got rid of unused deallocWhenLoaded flag.
Moved private properties to the .m file.
Cleaned up.