fix some errors
fix & clean codes