Code style review,some fixes