refactoring 010414-2