added act_as_taggable and cleanup