Modified to PEP8-style