refactoring 9/10/2014