clean up code

Clean up code