starting yapf cleanup