fix bug;
fix another style bug;