Refactor prep