- Comments and clean-up

- Final versions