fix style & delete redundant