manual fixes for PEP8 E711,E712