refactoring 020414-2