CLN some tweaks from autopep8