Added new param and started making PEP-8 compliant