Refactor clean up