Fix some style issue