Some changes about style