Clean up code and py
Clean up code and py