PEP8 conformity; removed outcommented code