refactoring polishing