Code cleanup

Clean up code