change & refactor