Revised according to PEP8