Fixed the API, made PEP 8 compliant