fix & clean source