Clean Up Code
Clean up code