Refactor and update prep