Python cleanup

Thanks Dan