Cleaned up prep.py to be more readable, have better variable names, etc