Clean up the code to meeting PEPs