Clean from redundant comments
Refactor for clarity
Fix small PEP issue