Refactor 0009