refactor for code format