Fix some style

More #589