improve readability
make assocications bi-directional