fix & clean