2014 refactoring