Fix some style issues according to comments