Some refactoring of associations and controllers