Refactoring: for less change of bugs.