Refactor using acts_as_list