Fix some style and indent issue