003 Refactor