Clean up

Clean up and comment clearly