Cleaned up code - assign rather than retain for delegate property