Added villager trading disable/enable, cleaned up duplicate code