Feature/python cleanup