Refactor 2014 6 2