More prep refactoring