refactoring03Oct