Refactoring 09-20