refactor 2014-09-30