Fixes for PEP8 compliance