code refactor

refactor