refactoring 03/17