refactoring 030714