refactoring 020414