Change some style issues to comply with code style