Changed prep method name and added some docstrings