Fix some style nits