Code cleaning accrding to PEP8