Some fixes to fit PEP8 coding standarts.