Updated to python 2.7 and modified indentation