refactoring: echo style ＆ indent fix