Non-drastical refactoring