refactoring 030414-1