Final clean up of first version