cleanup code

Clean up code