Change functions to comply with PEP 8