Fix some missed refactorization and modify having_and_belonging_to_many to not use an instance variable, or variable for that matter