edX: Cs, Python. One more refactoring.