Dry code

Signed-off-by: Michael Granados <michaelgranados@gmail.com>
Ordering associations

Signed-off-by: Michael Granados <michaelgranados@gmail.com>