Cleanup the code
Clean up the code