Fixes relationships so they do not impact each other
Removes double underscore prefix for some 'private' methods