refactoring 3/09/2014