refactoring 010414