Clean up

Clean up and personalize