Refactor 20141028