Clean up and reorganise prop.py.