Clean up the code

Clean the code