Clean up the code and py
Clean up the code and py