Refactor: Remove unused association
Refactor: Horizontol spacing