PEP8 and stdin fixes.