first steps towards SDC logic fix and PEP8-ifications