Clean up

Working on clean up