Fixed unsafe_retained and removed unnecessary ivars, modernized things up a bit.