PEP8, styling and small enhancements
Fix sizes type