Clean up code

Clean up code