Cleaned code according to PEP